Merge branch 'upstream-cvs' into upstream
authorBernd Zeimetz <bernd@bzed.de>
Tue, 7 Apr 2009 16:03:16 +0000 (18:03 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Tue, 7 Apr 2009 16:03:16 +0000 (18:03 +0200)

Trivial merge